From 0561c7a68d2b324b2013cff66e1d95e84b23fab9 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 19 Sep 2011 11:20:08 +0200 Subject: [PATCH] GtkTreeModelFilter: Fix build warnings https://bugzilla.gnome.org/show_bug.cgi?id=659441 --- gtk/gtktreemodelfilter.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index 3eb85e5720..9c81d68ad5 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -1655,6 +1655,9 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, iter.user_data = level; iter.user_data2 = elt; + parent = level->parent_elt; + parent_level = level->parent_level; + if (!parent || orig_level_ext_ref_count > 0) path = gtk_tree_model_get_path (GTK_TREE_MODEL (filter), &iter); else @@ -1664,9 +1667,6 @@ gtk_tree_model_filter_remove_elt_from_level (GtkTreeModelFilter *filter, */ path = NULL; - parent = level->parent_elt; - parent_level = level->parent_level; - length = g_sequence_get_length (level->seq); /* first register the node to be invisible */ @@ -3194,7 +3194,6 @@ static gboolean gtk_tree_model_filter_iter_next (GtkTreeModel *model, GtkTreeIter *iter) { - FilterLevel *level; FilterElt *elt; GSequenceIter *siter; @@ -3202,7 +3201,6 @@ gtk_tree_model_filter_iter_next (GtkTreeModel *model, g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->child_model != NULL, FALSE); g_return_val_if_fail (GTK_TREE_MODEL_FILTER (model)->priv->stamp == iter->stamp, FALSE); - level = iter->user_data; elt = iter->user_data2; siter = g_sequence_iter_next (elt->visible_siter); -- 2.30.2